恢复

ghs/src/components/module/item-list-layer.vue

@@ -1,7 +1,5 @@
 <template>
-  <<<<<<<
-    HEAD
-    <el-dialog
+  <el-dialog
     title="选择花材"
     :visible.sync="selDialog"
     :close-on-click-modal="false"
@@ -35,103 +33,51 @@
             <span v-if="scope.row.select == 2">✔</span>
             <span v-else></span>
           </template>
-          =======
-          <el-dialog
-            title="选择花材"
-            :visible.sync="selDialog"
-            :close-on-click-modal="false"
-            :append-to-body="true"
-            width="800px"
-          >
-            <div class="recharge-modal-content">
-              <el-checkbox-group
-                v-model="checkList"
-                class="radio-wrap"
-              >
-                <x-crud
-                  class="liu-crud-wrap"
-                  @load="onLoad"
-                >
-                  <template #table-column-radio="{scope}">
-                    <div>
-                      <el-checkbox
-                        v-if="scope.row.select == 2"
-                        disabled
-                        :label="scope.row.index"
-                      >{{scope.row.id}}</el-checkbox>
-                      <el-checkbox
-                        v-else
-                        :label="scope.row.index"
-                      >{{scope.row.id}}</el-checkbox>
-                    </div>
-                  </template>
 
-                  <template #table-column-select="{scope}">
-                    <span v-if="scope.row.select == 2">✔</span>
-                    <span v-else></span>
-                  </template>
-
-                  <template #table-column-stockWarning="{scope}">
-                    <el-input
-                      v-model="scope.row.stockWarning"
-                      placeholder="最低库存"
-                      size="small"
-                    ></el-input>
-                  </template>
-
-                  <template #table-column-cost="{scope}">
-                    <el-input
-                      v-model="scope.row.cost"
-                      placeholder="成本价"
-                      size="small"
-                    ></el-input>
-                  </template>
-                  >>>>>>> a67b34484ab61c97a0cb5497941e19d9255d302a
-
-                  <template #table-column-stockWarning="{scope}">
-                    <el-input
-                      v-model="scope.row.stockWarning"
-                      placeholder="最低库存"
-                      size="small"
-                    ></el-input>
-                  </template>
+          <template #table-column-stockWarning="{scope}">
+            <el-input
+              v-model="scope.row.stockWarning"
+              placeholder="最低库存"
+              size="small"
+            ></el-input>
+          </template>
 
-                  <template #table-column-cost="{scope}">
-                    <el-input
-                      v-model="scope.row.cost"
-                      placeholder="成本价"
-                      size="small"
-                    ></el-input>
-                  </template>
+          <template #table-column-cost="{scope}">
+            <el-input
+              v-model="scope.row.cost"
+              placeholder="成本价"
+              size="small"
+            ></el-input>
+          </template>
 
-                  <template #table-column-cover="{scope}">
-                    <div>
-                      <cl-avatar
-                        shape="square"
-                        :size="40"
-                        :src="scope.row.cover | default_avatar"
-                        :style="{ margin: 'auto' }"
-                      ></cl-avatar>
-                    </div>
-                  </template>
-                </x-crud>
-              </el-checkbox-group>
-            </div>
-            <div
-              slot="footer"
-              class="dialog-footer"
-            >
-              <el-button
-                size="small"
-                @click="resetForm"
-              >取 消</el-button>
-              <el-button
-                type="primary"
-                size="small"
-                @click="confirmFn"
-              >确定</el-button>
+          <template #table-column-cover="{scope}">
+            <div>
+              <cl-avatar
+                shape="square"
+                :size="40"
+                :src="scope.row.cover | default_avatar"
+                :style="{ margin: 'auto' }"
+              ></cl-avatar>
             </div>
-          </el-dialog>
+          </template>
+        </x-crud>
+      </el-checkbox-group>
+    </div>
+    <div
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button
+        size="small"
+        @click="resetForm"
+      >取 消</el-button>
+      <el-button
+        type="primary"
+        size="small"
+        @click="confirmFn"
+      >确定</el-button>
+    </div>
+  </el-dialog>
 </template>
 
 <script>

ghs/src/views/item/list.vue

@@ -36,53 +36,38 @@
 
       <template #table-column-inTurn="{scope}">
         <span v-if="!sort.status">{{ scope.row.inTurn }}</span>
-
-        <<<<<<<
-          HEAD
-          <el-input
+        <el-input
           ref="sort-input"
           focus
           size="mini"
           v-else
           v-model="scope.row.inTurn"
           @blur="changeSort(scope.row)"
-        >
-          </el-input>
+        ></el-input>
       </template>
-      =======
-      <el-input
-        ref="sort-input"
-        focus
-        size="mini"
-        v-else
-        v-model="scope.row.inTurn"
-        @blur="changeSort(scope.row)"
-      ></el-input>
-</template>
->>>>>>> a67b34484ab61c97a0cb5497941e19d9255d302a
 
       <!-- 排序 -->
       <template #table-header-inTurn>
-  <div class="set-sort">
-    <span>排序</span>
-    <el-button
-      v-if="!sort.status"
-      icon="el-icon-edit-outline"
-      size="small"
-      type="text"
-      @click="showSort"
-      class="show"
-    ></el-button>
+        <div class="set-sort">
+          <span>排序</span>
+          <el-button
+            v-if="!sort.status"
+            icon="el-icon-edit-outline"
+            size="small"
+            type="text"
+            @click="showSort"
+            class="show"
+          ></el-button>
 
-    <el-button
-      class="hide"
-      v-else
-      size="mini"
-      @click="hideSort"
-      type="primary"
-    >完成</el-button>
-  </div>
-</template>
+          <el-button
+            class="hide"
+            v-else
+            size="mini"
+            @click="hideSort"
+            type="primary"
+          >完成</el-button>
+        </div>
+      </template>
       <template
         #slot-add-goods-btn
         v-if="showAddBtn"