Explorar el Código

Merge branch 'sit'

xiaodai2022 hace 3 años
padre
commit
1042ca8b39
Se han modificado 2 ficheros con 108 adiciones y 75 borrados
  1. 10 0
      dist/static/js/0.js
  2. 98 75
      src/views/sellOut/sellReturn/components/addModel.vue

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 10 - 0
dist/static/js/0.js


+ 98 - 75
src/views/sellOut/sellReturn/components/addModel.vue

@@ -14,56 +14,54 @@
     element-loading-background="rgba(0, 0, 0, 0.8)"
   >
     <el-card style="margin: -20px 0 0 0">
-      <el-row :gutter="10">
-        <el-col :span="24">
-          <el-form
-            :model="ruleForm"
-            status-icon
-            :rules="rulesThis"
-            ref="ruleForm"
-            :size="'mini'"
-            label-width="80px"
-            class="demo-ruleForm"
-          >
-            <el-row :gutter="10">
-              <el-col :span="8">
-                <el-form-item label="退货类型" prop="return_type">
-                  <el-select
-                    v-model="ruleForm.return_type"
-                    style="width: 100%"
-                    placeholder="退货类型"
-                  >
-                    <el-option
-                      v-for="item in options"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="退货原因" prop="errorCode">
-                  <abnormal-cause
-                    :value="ruleForm.errorCode"
-                    :placeholder="'退货原因'"
-                    :type="'5'"
-                    :size="'mini'"
-                    @searchChange="errorCode_change"
-                  />
-                </el-form-item> </el-col
-              ><el-col :span="16">
-                <el-form-item label="退货备注" prop="remark">
-                  <el-input
-                    :disabled="isDetail"
-                    type="textarea"
-                    :rows="3"
-                    maxlength="250"
-                    show-word-limit
-                    placeholder="请填写备注"
-                    v-model="ruleForm.remark"
-                  /> </el-form-item></el-col
-            ></el-row>
-
+      <el-form
+        :model="ruleForm"
+        status-icon
+        :rules="rulesThis"
+        ref="ruleForm"
+        :size="'mini'"
+        label-width="80px"
+        class="demo-ruleForm"
+      >
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="退货类型" prop="return_type">
+              <el-select
+                v-model="ruleForm.return_type"
+                style="width: 100%"
+                placeholder="退货类型"
+              >
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="退货原因" prop="errorCode">
+              <abnormal-cause
+                :value="ruleForm.errorCode"
+                :placeholder="'退货原因'"
+                :type="'5'"
+                :size="'mini'"
+                @searchChange="errorCode_change"
+              />
+            </el-form-item> </el-col
+          ><el-col :span="16">
+            <el-form-item label="退货备注" prop="remark">
+              <el-input
+                :disabled="isDetail"
+                type="textarea"
+                :rows="3"
+                maxlength="250"
+                show-word-limit
+                placeholder="请填写备注"
+                v-model="ruleForm.remark"
+              /> </el-form-item
+          ></el-col>
+          <el-col :span="24" v-show="ruleForm.return_type === '2'">
             <el-form-item label="收货信息" :size="'mini'" required>
               <el-table
                 :data="tableForm.get_product_go"
@@ -91,16 +89,23 @@
 
                 <el-table-column label="退货数量" width="150">
                   <template slot-scope="scope">
-                    <el-form-item style="margin: 0" :size="'mini'">
-                      <el-input-number
-                        size="mini"
-                        v-model="scope.row.return_num"
-                        :disabled="!scope.row.edit"
-                        :min="0"
-                        :max="scope.row.wsend_num"
-                        :precision="0"
-                      />
-                    </el-form-item>
+                    <digital-input
+                      v-show="scope.row.edit"
+                      :values="scope.row.return_num"
+                      :placeholder="'供应商采购金价'"
+                      :min="0"
+                      :disabled="false"
+                      :max="100000000000"
+                      :position="'right'"
+                      :precision="0"
+                      :size="'mini'"
+                      :controls="false"
+                      :append="''"
+                      @reschange="number_change($event, 'return_num', index)"
+                    />
+                    <span v-show="!scope.row.edit">
+                      {{ scope.row.return_num }}
+                    </span>
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -143,20 +148,38 @@
                 </el-table-column>
               </el-table>
             </el-form-item>
-          </el-form>
-        </el-col>
-        <el-col :span="24" style="text-align: right">
-          <el-button type="primary" @click="submitForm" :size="'mini'"
-            >保 存
-          </el-button>
-          <el-button
-            @click="showModelThis = false"
-            v-if="!isDetail"
-            :size="'mini'"
-            >关 闭</el-button
-          >
-        </el-col>
-      </el-row>
+          </el-col>
+          <el-col :span="24">
+            <el-row>
+              <el-col :span="8" v-show="ruleForm.return_type === '1'">
+                <el-form-item label="退货原因" prop="errorCode">
+                  <abnormal-cause
+                    :value="ruleForm.errorCode"
+                    :placeholder="'退货原因'"
+                    :type="'5'"
+                    :size="'mini'"
+                    @searchChange="errorCode_change"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col
+                :span="ruleForm.return_type === '1' ? 16 : 24"
+                style="text-align: right"
+              >
+                <el-button type="primary" @click="submitForm" :size="'mini'"
+                  >保 存
+                </el-button>
+                <el-button
+                  @click="showModelThis = false"
+                  v-if="!isDetail"
+                  :size="'mini'"
+                  >关 闭</el-button
+                >
+              </el-col>
+            </el-row>
+          </el-col>
+        </el-row>
+      </el-form>
     </el-card>
   </el-dialog>
 </template>
@@ -266,7 +289,7 @@ export default {
           });
           this.ruleForm = {
             orderCode: orderCode || "",
-            return_type:"1",
+            return_type: "1",
             remark: "", //退货备注
             errorCode: "", //退货原因
           };

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio